From: Marina Zhurakhinskaya <marinaz@redhat.com>
Date: Sun, 19 Aug 2012 22:21:50 +0000 (-0400)
Subject: messageTray: hide removed notification without tweening
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6125
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f8eab659d9b732918fb17923c22ec08bf09315c8;p=gnome-shell.git

messageTray: hide removed notification without tweening

This reflects more accurately what happens when a notification is removed.

this._pointerInTray value needs to be set to false in this case.
---

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 5958a873d..39f9268d1 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -2117,19 +2117,27 @@ const MessageTray = new Lang.Class({
             this._notificationExpandedId = 0;
         }
 
-        this._tween(this._notificationBin, '_notificationState', State.HIDDEN,
-                    { y: this.actor.height,
-                      opacity: 0,
-                      time: ANIMATION_TIME,
-                      transition: 'easeOutQuad',
-                      onComplete: this._hideNotificationCompleted,
-                      onCompleteScope: this
-                    });
+        if (this._notificationRemoved) {
+            this._notificationBin.y = this.actor.height;
+            this._notificationBin.opacity = 0;
+            this._notificationState = State.HIDDEN;
+            this._hideNotificationCompleted();
+        } else {
+            this._tween(this._notificationBin, '_notificationState', State.HIDDEN,
+                        { y: this.actor.height,
+                          opacity: 0,
+                          time: ANIMATION_TIME,
+                          transition: 'easeOutQuad',
+                          onComplete: this._hideNotificationCompleted,
+                          onCompleteScope: this
+                        });
+        }
     },
 
     _hideNotificationCompleted: function() {
         this._notificationRemoved = false;
         this._notificationBin.hide();
+        this._pointerInTray = false;
         this._notificationBin.child = null;
         this._notification.collapseCompleted();
         this._notification.disconnect(this._notificationClickedId);